range: better hack for GtkColorScale
authorCosimo Cecchi <cosimoc@gnome.org>
Sun, 28 Feb 2016 07:19:13 +0000 (23:19 -0800)
committerCosimo Cecchi <cosimoc@gnome.org>
Mon, 29 Feb 2016 18:45:13 +0000 (10:45 -0800)
Just draw the slider, since that is the only thing GtkColorScale cares
about.

gtk/gtkrange.c

index 419be4881d8d50355d42a402b7c77bae7d02b4b2..e8f04d50bba609e2678dbfcb5a3d94516899c6f1 100644 (file)
@@ -2314,28 +2314,17 @@ gtk_range_render (GtkCssGadget *gadget,
   GtkWidget *widget = gtk_css_gadget_get_owner (gadget);
   GtkRange *range = GTK_RANGE (widget);
   GtkRangePrivate *priv = range->priv;
-  gboolean draw_trough = TRUE;
 
   /* HACK: we can't render the contents box directly because
    * GtkColorScale wants to omit the trough but still draw the slider...
    */
   if (GTK_IS_COLOR_SCALE (widget))
-      draw_trough = FALSE;
-
-  if (draw_trough)
-    gtk_css_gadget_draw (priv->trough_gadget, cr);
-
-  if (priv->stepper_a_gadget)
-    gtk_css_gadget_draw (priv->stepper_a_gadget, cr);
-
-  if (priv->stepper_b_gadget)
-    gtk_css_gadget_draw (priv->stepper_b_gadget, cr);
-
-  if (priv->stepper_c_gadget)
-    gtk_css_gadget_draw (priv->stepper_c_gadget, cr);
+    {
+      gtk_css_gadget_draw (priv->slider_gadget, cr);
+      return FALSE;
+    }
 
-  if (priv->stepper_d_gadget)
-    gtk_css_gadget_draw (priv->stepper_d_gadget, cr);
+  gtk_css_gadget_draw (priv->contents_gadget, cr);
 
   return FALSE;
 }